Reconcile with ics-factoryrom-release

Change-Id: Ia9dffe4458e064a55878e989ba73763158e008fe