am ad8126d0: Reconcile with ics-mr1-release

* commit 'ad8126d0199af924f8036a81297e1f67c3bba7ab':