From infra_internal, revisions 6f979a..cd0150f.

TBR=sergiyb@chromium.org,machenbach@chromium.org
BUG=

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

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