BUG=chromium:474921,chromium:626064

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