BUG=chromium:635948

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