am fe548d6a: Reconcile with ics-mr1-release

* commit 'fe548d6a965bfa990e1f9b291a3e526e52c5ad38':