Reconcile with ics-factoryrom-release

Change-Id: I03cef1cd6b01c6c835349e8c9e8f6d2f53132f17