am 186f9542: am 7db22c1b: Reconcile with ics-mr1-release

* commit '186f954270517cc22de27e6fb3e3a90d9dc59de2':