Merge "Move some non-flaky tests to pre-submit"