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