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

Change-Id: I96a840c55180d6b78a33860a909fff728591f0af