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

Change-Id: Ied174eb2f5aca5f694daf6c1c13b273f0ead6b9a