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

Change-Id: I67aa0b4ef26dd077add14e39ec02d11ec9223c98