R=hablich@chromium.org

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

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