Merge "Fixing flakey tests" into oc-dev