Co-authored-by: Haowei Cai <haoweic@google.com> Kubernetes-commit: 369475681679e1cb68c23c3355542599a3c0e1e3