Reconcile with ics-factoryrom-release

Change-Id: I4a975400038f8f063cc31eb236735980365926e2