Reconcile with ics-factoryrom-2-release

Change-Id: I7f53fdbe6acf900cdd3322d238bf6fa659c95ff0