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

Change-Id: Ie68f563d8978947da001da93bea96cd7b8051012