Merge "Fix a flaky test" into rvc-dev am: 37d52ce20b am: 07fea62af5 am: 5bf4a8a05d

Change-Id: Ib42e99cc3c8ed0c6590d3d857cfc9e7d063f4af5