Merge "Fix race condition / test flakiness." into oc-dr1-dev