Merge "Fix a way for this test to flake."