Merge "Fix a way for this test to flake."
tree: 7797ccc99291c712016daedfb9e68bdee4d85cf2
  1. tests/