BUG=chromium:650577,chromium:648568

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