Merge pull request #67210 from janetkuo/automated-cherry-pick-of-#66581-upstream-release-1.11

Automated cherry pick of #66581 upstream release 1.11

Kubernetes-commit: 640dd3c50bbfe910308309a89d761b57ab711b6f