Merge "Separate encryption_types_client from types_client"