R=jkummerow@chromium.org

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

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