am c91e3d47: Reconcile with ics-mr1-release

* commit 'c91e3d476a8002fc6e8f994152be5dc4b3b85489':