Reconcile with ics-factoryrom-release

Change-Id: I664abe873e7860e7adcece9e9dc65e7f19a11ee0