
Automatic merge from submit-queue reverted the code from 23688 that cause race condition with older version of Go ```release-note * release-note-None ``` []()