Reconcile with ics-factoryrom-release

Change-Id: I8642724549283dbcd3d104a35d5c659e5591682e