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

Change-Id: I754bec03bf6ccaa127178de387cac45959ed9bf8