am ce77af47: Reconcile with ics-mr1-release

* commit 'ce77af47e979d365155e4003ca2943b639600e73':