Reconcile with ics-factoryrom-release

Change-Id: I34113db5bf74bcf9fbc0649d022cc533b4cc3469