R=mvstanton@chromium.org
NOTRY=true

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

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