am 068436ed: Reconcile with ics-mr1-release

* commit '068436ed63787281b9f390da0e3363c46f252077':