am c81911f4: Reconcile with ics-mr1-release

* commit 'c81911f42c405d6dafa8ffda5eda9984855fa8a0':