am aac21480: Reconcile with ics-mr1-release

* commit 'aac214800b518259306960ff9cc90de65d095398':