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