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

Change-Id: I4cb519e0e9f998844e8d5227c4535810f4e55d6c