R=rmcilroy@chromium.org

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

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