R=machenbach@chromium.org
NOTRY=true
BUG=chromium:611010

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