am 958e00db: Reconcile with ics-mr0-release

* commit '958e00db87e8b6efea12df62a5634d99583ff8eb':
  ICL25
  ICL24D