Merge "Fix flaky tests" into oc-dev
am: b80cffad4b

Change-Id: Ia78dac2c9333a89f48a998b8df9b0f12e78da71c