BUG=chromium:667678
NOTRY=true
TBR=titzer@chromium.org,bradnelson@chromium.org

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