BUG=chromium:673308,chromium:689555

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