R=mvstanton@chromium.org

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

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