Merge "Disabling flaky test until fix is found" into rvc-dev am: b20995ba8e

Change-Id: Ifa66e2fb2a08b7fefa3c2fa944ba6fa4c953ed82