Reconcile with ics-factoryrom-release

Change-Id: I412a835f2e84fb56191c0378cf5dc908935f7b8a