From 443e9088bbbf79be18ee27b28fb985878de85a34 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Wed, 8 Jul 2020 21:20:52 -0700
Subject: [PATCH] Merge pull request #92688 from
 wojtek-t/automated-cherry-pick-of-#92537-upstream-release-1.18

Automated cherry pick of #92537 upstream release 1.18

Kubernetes-commit: 91ae197b9d0b13b8280992595d0556d118bf11dd