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