Reconcile with ics-factoryrom-release

Change-Id: I859743c56d3721278fed7e22b7d41d0592b00118