R=vogelheim@chromium.org

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