am ae4a0b92: Reconcile with ics-mr1-release

* commit 'ae4a0b9276939594151078b963f80c86c9634637':