Merge "Fix a flaky test"