Port https://codereview.chromium.org/1154633003/

BUG=chromium:535160
LOG=n

Review URL: https://codereview.chromium.org/1380983002

Cr-Commit-Position: refs/heads/master@{#31045}