am bada4ddc: Reconcile with ics-mr1-release

* commit 'bada4ddcea0fcba968a1ff31e42342d8a8cceb0a':