Reconcile with ics-factoryrom-2-release

Change-Id: I1b9c07a111d23bd863d4beb0a31a2ab949e9eae7