BUG=470930
LOG=N
R=jochen@chromium.org

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

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