Merge "Temporarily ignore a flaky test." into rvc-dev am: 019ff80d23

Change-Id: I3e144ef423a75840134a871ee2d9d5e96d433ac9