Reconcile with ics-factoryrom-release

Change-Id: I07c391b65a870c4d557a51cc4ed00a5f9474cfed