Merge "Fix flaky test?" into oc-dev am: 030107f0bd
am: 16c981ea43

Change-Id: I7162f1b25b97c2f89c45103a6c7b2cf290fc38cd