am 230d4c23: Reconcile with ics-mr1-release

* commit '230d4c236982058767225f59ad6b5a3fc3f638b6':