BUG=chromium:617761
NOTRY=true

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