am 2921f03d: Reconcile with ics-mr1-release

* commit '2921f03d716f2aeb52712a81faaf7dfb597d0826':
  IMM06