am fdc37767: Reconcile with ics-mr1-release

* commit 'fdc37767c165455ffad1cfe88b64156de728d129':