am 62a16e23: Reconcile with ics-mr1-release

* commit '62a16e230529ec015518a3abac872ab008892e2d':
  IMM30D
  IMM30C
  IMM3C