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

Change-Id: Ie43450ec93e95bfdf97b10e2bf4070b97051ba7f