Previous attempt: https://codereview.chromium.org/1642023002

TBR=martiniss

BUG=582074

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

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