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

Change-Id: I20d01eabd613ead86f1ab98929507906f27cecc3