am d79e6842: Reconcile with ics-mr1-release

* commit 'd79e684287ccf6673e251458c0ad571af8c86611':