Merge "Make 1917 less flaky"