BUG=chromium:616035
NOTRY=true

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