Signed-off-by: Mik Vyatskov <vmik@google.com> Kubernetes-commit: 3f0e49aea430c30f4539d34c0f93486fd451d073