Reconcile with ics-factoryrom-2-release

Change-Id: I2059be2fb54d852023cb4e4b96493ff6a934ffe0