Merge "Update VTS tests so that more tests pass for O." into oc-dr1-dev