R=adamk@chromium.org
BUG=
NOTRY=true

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