Merge "Fix a flaky test (5/n)"