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

Change-Id: I3ae44198c1f15967b8a774a5166c678c0be0ab47