Reconcile with ics-factoryrom-2-release

Change-Id: I744c148cd22781c33cd51cd734a055952f39d648