am 90b66d88: am 6532f0e5: Reconcile with ics-mr1-release

* commit '90b66d881a065b5df86af5b415cc2399e29905a4':
  IMM47
  IMM46
  IMM45
  IMM30E