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

* commit '84beed8a3214b71b9e29a3dbecd1af77caf6451c':