Merge "Remove base_types_client for the reability"