R=rmcilroy@chromium.org

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

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