am 23c45bac: Reconcile with ics-mr1-release

* commit '23c45bac209c18dd8fd6260e338e566df946c968':