Thanks for your pull request. It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed, please reply here (e.g. I signed it!) and we'll verify. Thanks.

• If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
• If you signed the CLA as a corporation, please let us know the company's name.

One of a couple cherrypicks needed to run jenkins unit/integration against release branches. ref #16287

Labelling this PR as size/M

GCE e2e test build/test passed for commit 706cf5e.

• Build Log
• Test Artifacts
• Internal Jenkins Results

@jlowdermilk this a good candidate for a manual merge?

@krousey yes, please. Should be safe and will help unblock getting jenkins unit/integration to run on branches.