am 9afec0a1: am a9574676: Reconcile with ics-mr0-release

* commit '9afec0a1b4d3d9b50db263a4f979261b9b346a90':