R=svenpanne@chromium.org

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

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