am d32ee5ba: Reconcile with ics-mr1-release

* commit 'd32ee5baa057992431263907ec5cf8f19b43c043':