Merge "Revert "Disabling flaky test until fix is found"" into rvc-dev am: 77762fdf4f am: 06aae1303c

Change-Id: I21768c8a770321dc562b6d9aeab77314ab322950