R=machenbach@chromium.org

Review-Url: https://codereview.chromium.org/1994923002
Cr-Commit-Position: refs/heads/master@{#36367}