Merge "Fix race condition / test flakiness." into oc-dr1-dev
am: 0c8e5b6dda

Change-Id: I3439609155e18644b713b2ae25dee1b15f28cfbc