Merge "Deprecate client_parameters from ServiceClients"