Merge "Remove volume v1 API service client usage"