am c4bcc26e: am 512879f4: Reconcile with ics-mr0-release

* commit 'c4bcc26e584a85fea89e4d691e1d2d8214e08014':
  ICL32B
  ICL32