R=mvstanton@chromium.org

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