am dff907ec: Reconcile with ics-mr1-release

* commit 'dff907ecf5225402f3c2e3930ae8cbb292b22858':