Merge "Disable flaky vts tests" into oc-dev