am a76cba57: Reconcile with ics-mr1-release

* commit 'a76cba577c7ac6770084c04dc12e6cd9908320ec':