Merge "Make test 924 less flaky."