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

Change-Id: I4433346a8b7f9848dcf65f5e6b967faa12c0e375