am a9574676: Reconcile with ics-mr0-release

* commit 'a9574676435b75ed2f6b2208313c348d8b4f7a13':