TBR=jochen@chromium.org

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

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