BUG=chromium:542823 LOG=n Review URL: https://codereview.chromium.org/1391373004 Cr-Commit-Position: refs/heads/master@{#31257}