Merge "[V3] Make service_client use **kwargs"