Reconcile with ics-factoryrom-release

Change-Id: I7c2f0791fec871bd499afc9eaa41fd1dc55b91c5