am 16bdd1e6: Reconcile with ics-mr1-release

* commit '16bdd1e65ef19379bbede40c38de2e9f816ba35b':