Rebase to chromium's 23fcb7eaa561bd942cc22fdde178347c2c8187c3