Merge "Revert "Disabling flaky test until fix is found"" into rvc-dev am: 77762fdf4f am: 9ee749bf90 am: 803f98b8d7

Change-Id: Ic677e52d4f90e904ca54e22adb53ab0ba2c5d20a