BUG=
TBR=verwaest@chromium.org

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

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