am ae6cfb6d: Reconcile with ics-mr1-release

* commit 'ae6cfb6de308e01325e52092d1846c39cc86070a':