Automatic merge from submit-queue Fix 29451 Fix #29451. I've also checked other tests in that file to make sure they don't have similar problems. The issue is P0 and will block the submit queue, so I marked this PR as P0.