Merge "Fix flaky tests" into oc-dev