Reconcile with ics-factoryrom-2-release

Change-Id: I013f1416c32e7a540621d22c7f2d6815f011527c