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

Change-Id: I1d65127136a6499943db47356f54ed00ddd2969c