Fix recently broken racetest on master (#12383)
Fix recently broken racetest on master (#12383)

* Fix racetest

* Lint

* One more race

* Added a todo with issue ref

istio/istio,istio/istio,smawson/istio,smawson/istio,geeknoid/istio,geeknoid/istio,smawson/istio,istio/istio,istio/istio,geeknoid/istio,smawson/istio,geeknoid/istio,istio/istio,smawson/istio,geeknoid/istio,smawson/istio,geeknoid/istio