TBR=verwaest@chromium.org

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

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