Merge "Separate schemas_client from v2 images_client"