Merge "Backport VTS fixes to previous test versions" into udc-dev