R=machenbach@chromium.org
NOPRESUBMIT=true
NOTRY=true

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

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