am 3e72c93b: Reconcile with ics-mr1-release

* commit '3e72c93b1652ec021fa0965e432b508b847b2b74':