R=dfalcantara@chromium.org
BUG=466421

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

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