R=littledan@chromium.org

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