Merge "Fixed a flakey test" into oc-mr1-dev