Merge "Move non-flaky not too long tests into presubmit"