am 1636ba2f: Reconcile with ics-mr1-release

* commit '1636ba2f40fe38188840c64978bc1d29008ed27e':