TBR=mvstanton@chromium.org

Review-Url: https://codereview.chromium.org/2658463004
Cr-Commit-Position: refs/heads/master@{#42702}