am c4c305e3: am a2ca4f14: Reconcile with ics-mr1-release

* commit 'c4c305e331e4e5ae3f5616f79dfc597e2abfc166':
  IMM48