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

Change-Id: I3b92831ece6dade82d334ad96d69937a520a79a2