Reconcile with ics-factoryrom-release

Change-Id: I12f4b04c88d1610a2080f2835a0d388360f36bd4