Merge "[V3 identity] Renaming service_client into services_client"