am 090bad1b: am fdc37767: Reconcile with ics-mr1-release

* commit '090bad1be66b003e052911a6ff915170f26694aa':