am f26d9d58: Reconcile with ics-mr1-release

* commit 'f26d9d5884339dc450831dd453bbb77b4e77d9e5':