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

Change-Id: I3f376b4198deaf9b289ae7407d8f6b0bd2f71a51