R=hpayer@chromium.org
BUG=chromium:601014, chromium:601329, chromium:581412
LOG=N

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

Cr-Commit-Position: refs/heads/master@{#35327}