Reconcile with ics-factoryrom-2-release

Change-Id: I6cdea93db67191c56ca851cfc33536472c53e874