Reconcile with ics-factoryrom-release

Change-Id: I4096cbbfd0bae1f7c08c9731f522529d3895d2d8