Reconcile with ics-factoryrom-release

Change-Id: Ibd1dca227b44e13538ea0b9f6aea45d180a010d3