am cdbe75d6: am 02ea5c79: Reconcile with ics-mr1-release

* commit 'cdbe75d6afc50e9386f44a5169c6fbeec9477c99':