Merge "Remove unnecessary str() from base_types_client"