Merge back changes from latest Chromium code review.