Reconcile with ics-factoryrom-release

Change-Id: I82601a2de420ce916449f1d7c143963731ad621e