am a91c3232: Reconcile with ics-mr1-release

* commit 'a91c3232fcfe908ddb65be33bdeedff344dfc7d8':