am a2ca4f14: Reconcile with ics-mr1-release

* commit 'a2ca4f14f43636b00aba274718854e9ed851959d':
  IMM48