am a961c06b: Reconcile with ics-mr0-release

* commit 'a961c06b9c0718406a72d71125aa0bf45d3c8659':