R=jochen@chromium.org
NOTRY=true
BUG=

Review-Url: https://codereview.chromium.org/2452013002
Cr-Commit-Position: refs/heads/master@{#40587}