merge in release branch changes (no-op).
tree: c98f8013320a8e198c31939b508e64a6d4fdfbec
  1. kernel