R=jochen@chromium.org
LOG=n

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

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