Manual land of https://chromiumcodereview.appspot.com/2009173002/ due to CQ
lineending issues.

AUTHOR=techtonik@gmail.com
R=phajdan.jr@chromium.org, techtonik@gmail.com, dpranke@chromium.org
BUG=

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

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