am b384f360: am 0e511149: Reconcile with ics-mr1-release

* commit 'b384f3605ecae338eb28e6ef5e8bc876981058e0':