Automated cherry pick of #77613 upstream release 1.13 Kubernetes-commit: bb630af86712366105b76959acca5bd71798bfb1