Merge "Revert "Removed flaky test from pre-submit"" into rvc-dev