am 134c0348: Reconcile with ics-mr1-release

* commit '134c0348f9643eff06e1d69f7a144a1870aa29e4':
  IMM54