am c9054b11: Reconcile with ics-mr1-release

* commit 'c9054b11fa3895fe70b2eaba849c6388df449c1e':
  IMM18
  IMM13
  IMM12