am 6019f7b0: Reconcile with ics-mr1-release

* commit '6019f7b0954cdf2e9063087c94f825778a6feda0':
  IMM11