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

Change-Id: Ifb83f6048db359205796e4f767015f970b32ce27