R=bmeuerer@chromium.org

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