am c9024703: Reconcile with ics-mr1-release

* commit 'c902470310404e42aeb93fca38694b374371e0de':