Depends on https://codereview.chromium.org/1667713002

BUG=583626

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

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