R=machenbach@chromium.org, jochen@chromium.org
BUG=crbug.com/344767
LOG=Y

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

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