R=rossberg@chromium.org

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

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