am a4ea7a8f: am c30fdda0: Reconcile with ics-mr1-release

* commit 'a4ea7a8f204890aee9a50d2e65b410bb443b7149':