Reconcile with ics-factoryrom-release

Change-Id: I255db04bfa6c81e1317f578cb0c05be25f3500d8