R=svenpanne@chromium.org BUG=chromium:441896 LOG=N Review URL: https://codereview.chromium.org/866553003 Cr-Commit-Position: refs/heads/master@{#26482}