Original CL: https://codereview.chromium.org/1437483002/.

R=dnj@google.com, tandrii@chromium.org, dnj@chromium.org, pgervais@chromium.org
BUG=542922, 503067

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

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