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

Change-Id: I4d108c798e1229748a77487d82bfbd4364ce676d