Reconcile with ics-factoryrom-release

Change-Id: I401a78a2216c8c4042f6f48b4e882035cbccfc82