am 6532f0e5: Reconcile with ics-mr1-release

* commit '6532f0e55b4340fe91a1097d3ddd72282b4de50d':
  IMM47
  IMM46
  IMM45
  IMM30E