R=thakis@chromium.org, titzer@chromium.org

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

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