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

Change-Id: Iec2423ca42f4e9ec5efebdec4a7587d4381800f3