R=thakis@chromium.org, sebmarchand@chromium.org
BUG=495204,585829

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

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