Reconcile with ics-factoryrom-release

Change-Id: I1510798b512a34be4947b727df3146ad9f6a31ba