am afc3fb47: am a91c3232: Reconcile with ics-mr1-release

* commit 'afc3fb4729b128b7d1dd9e10a3058677d6199f9f':