R=ishell@chromium.org
BUG=

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