BUG=chromium:487105 LOG=N Review URL: https://codereview.chromium.org/1136123010 Cr-Commit-Position: refs/heads/master@{#28480}