TBR=jarin@chromium.org

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

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