cherry-pick #9346 to v1.84.x #9372
+43
−13
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.