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

Change-Id: If8a04ba38ae3dc8f6b3cdc9ba88f5e145daa7a69