Ports https://codereview.chromium.org/2293853002 to unblock
deps roller.

BUG=474921
TBR=jochen@chromium.org, kjellander@chromium.org, vogelheim@chromium.org
NOTRY=true

Review-Url: https://codereview.chromium.org/2290233005
Cr-Commit-Position: refs/heads/master@{#39034}

Port https://codereview.chromium.org/2267753002/

BUG=474921
TBR=jochen@chromium.org, kjellander@chromium.org, vogelheim@chromium.org

Review-Url: https://codereview.chromium.org/2290213002
Cr-Commit-Position: refs/heads/master@{#39009}

BUG=chromium:629806

Review-Url: https://codereview.chromium.org/2187433002
Cr-Commit-Position: refs/heads/master@{#38054}

BUG=chromium:474921,chromium:626064

Review-Url: https://codereview.chromium.org/2134223003
Cr-Commit-Position: refs/heads/master@{#37679}