Reconcile with ics-factoryrom-release

Change-Id: I432900d452f3f8869f42a0ff4ae0d34e1c34dc46