R=jochen@chromium.org
BUG=chromium:595634
LOG=N

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

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