Merge "Fixed a flakey test" into oc-mr1-dev
am: e501718337

Change-Id: Ie634dcd4fc79945447987126755c94a6fd7c2233