Reconcile with ics-factoryrom-2-release

Change-Id: Ic31dfff75cc16c850e38acf7ce79df497e09fcd2