This must land in sync with https://chromereviews.googleplex.com/202077014 and
revert in sync.

R=akuegel@chromium.org
TBR=pgervais@chromium.org
BUG=471767

Review URL: https://codereview.chromium.org/1157843007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295509 0039d316-1c4b-4281-b951-d872f2087c98