am 2762cc65: am 8971407b: Reconcile with ics-mr1-release

* commit '2762cc651bf87594ab7d265f3d573778a3286e1b':