R=rmcilroy@chromium.org

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

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