Merge "Cherry pick from upstream Chromium to ease merge from M30." into klp-dev