R=machenbach@chromium.rg
LOG=n
BUG=none
NOTRY=true

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

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