am 0f4616b0: am 065506ec: Reconcile with ics-mr1-release

* commit '0f4616b017b72deec9f0b3c20205cd447fea835d':
  IMM52