am 8f4b2e12: am 1a0475ac: Reconcile with ics-mr1-release

* commit '8f4b2e12b8fdddb5501a1064db59efd815e594dd':