Merge "Remove deprecated APIs from volume v2 volumes_client"