Merge "Move volume v2 service clients to v3 dir"