am c263b345: Reconcile with ics-mr1-release

* commit 'c263b3450fc291f367eb277e73b2b70060834707':