R=vogelheim@chromium.org

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

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