Merge "Fix failing VTS test cases" into oc-dev