am 51475183: Reconcile with ics-mr1-release

* commit '514751834753b30d37eae591ccce2e69e3468602':
  IMM20B
  IMM20