Fix flake.

17 jobs for !2721 with cherry-pick-95fa7121 in 20 minutes and 3 seconds (queued for 2 seconds)
merge request