am c448c082: Reconcile with ics-mr1-release

* commit 'c448c082cf834f95afcfa3296eba2c67780727cf':