am 24215999: Reconcile with ics-mr0-release

* commit '24215999d0a9d603aeea3c88ceedfb8e36fcf947':
  ICL53