Merge "Fix a flaky test" into rvc-dev am: 37d52ce20b

Change-Id: I6a589125294f7d78315bc3b18177a00abe911bc4