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

Change-Id: I28578659ad58cd1237379d205628b71c5da836d3