Merge "Avoid using v3 volume clients when v3 is disabled"