Reconcile with ics-factoryrom-release

Change-Id: Iaebcfef5371506aec5cd6cda25ce0889005018f9