R=dcarney@chromium.org

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

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