Merge "Move some no longer flaky tests to pre-submit"