Merge "Fix VTS tests."