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