am e363d387: am b90cb1d2: am c6023243: Reconcile with ics-factoryrom-2-release

* commit 'e363d387a401ccd3a0635b449f3aa966a65607de':