Merge "Fix VTS ValidationTest for 1.2 ops."