Reconcile with ics-factoryrom-2-release

Change-Id: I9671d18aeee882196d56644533c962942c4fbb70