Merge "Remove migrated service clients from test_service_client"