Merge "Fixes VTS test failures."