Reconcile with ics-factoryrom-2-release

Change-Id: Id092aea61ede38a6e5018b4e66586ca3025528fa