am aee9fc1e: Reconcile with ics-mr1-release

* commit 'aee9fc1e4a44004a2d0b76dcf4f33cb544d29189':