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

Change-Id: Ifb2cd58913e4edb126c05ba07d12d4d43ed57c3b