Merge "Fix unittest of encryption_types_client"