am 512879f4: Reconcile with ics-mr0-release

* commit '512879f4c548233d14a2c9cf86a386574ae3d1b1':
  ICL32B
  ICL32