Reconcile with ics-factoryrom-release

Change-Id: Iec2a62de9ec37e871999a0580a83947080274bc7