Reconcile with ics-factoryrom-release

Change-Id: Ia4037679977351e39450e5fc9f15e2a4b37f0cff