BUG=chromium:625791

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