BUG=chromium:677032
NOTRY=true
TBR=titzer@chromium.org

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