Merge "Revert "Remove flaky tests from presubmit."" into tm-dev