am c49f7610: Reconcile with ics-mr1-release

* commit 'c49f76108a615121615e290e2e4e19b59c4cf086':