Merge "Make test 1934 not flaky."