Merge "Fix broken and flaky VTS tests"