Signed-off-by: Joe Betz <jpbetz@google.com> Kubernetes-commit: 5647c07179df7df9ae6775f3f7692462db93d68b