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

Change-Id: I7b21decefdea2bc52a6b9c1283d0189724091488