am 1a99df36: Reconcile with ics-mr1-release

* commit '1a99df369de18be732f99829ee3f38ef5c207a89':