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

Change-Id: Id33bd57718e1c59c216ba98a59979355a36ada60