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

Change-Id: I9dd0907bc207f79147227c2cb8f23dc0c84e1053