am 943f9a58: Reconcile with ics-mr1-release

* commit '943f9a58a3eb3240c8a85efa49a25a77282f5d48':
  IMM04