am aed57008: am 84beed8a: am e3e777f7: Reconcile with ics-mr1-release

* commit 'aed5700857b87e3b11cd88833a038812ec1626c3':