am a1fbf8f3: Reconcile with ics-mr1-release

* commit 'a1fbf8f3ed9495b02deb624ac284dbfdf2fbfcba':