am dfed08bc: am 7e4aa24c: Reconcile with ics-mr1-release

* commit 'dfed08bcfd3ff738cb3a14b261eff2f1b50d4e04':