Reconcile with ics-factoryrom-release

Change-Id: I0a35a81c49649458f8c02b093a8638539c65049d