am 72c4afc9: Reconcile with ics-mr1-release

* commit '72c4afc998d6362d94acfa943349091993edad11':
  IMM47B