Automatic merge from submit-queue Fix 29992 Fix #29992. I copied RC test code to the wrong place to the RS test in #29798. I took a look at the failure reports, they were all failed on the RS test, so #29798 itself is correct. Marked as P2 since it fixes a test flake that will block everyone.