Merge "Merge "Fix race condition / test flakiness." into oc-dr1-dev am: 0c8e5b6dda am: d2e8a019a4" into oc-mr1-dev-plus-aosp
am: 4584cb741a

Change-Id: I18882a9d2c15e4b9e55b0da4c22a085c3935fc8c