R=jochen
BUG=
NOTRY=true
NOTREECHECKS=true

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