am 863c9311: Reconcile with ics-mr1-release

* commit '863c9311d3f3912f02931265906b08ac780f2a1d':