Merge "Stop testing volume v2 APIs"