Reconcile with ics-factoryrom-release

Change-Id: I5f3fe0c78905638535925d842337bffcd504a95b