am 065506ec: Reconcile with ics-mr1-release

* commit '065506ec25b39b1abdcefb483992d71be70defb6':
  IMM52