am ba50bbf6: Reconcile with ics-mr1-release

* commit 'ba50bbf6d0745cdf3c8baba10f0fb69a60cc92f0':