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

Change-Id: Id650a9e2ca008f19b26eb152a87f961b3fe2abec