Merge "Fix broken and flaky VTS tests" into udc-dev