Reconcile with ics-factoryrom-2-release

Change-Id: I1f671bf650765b06ffbccedc1a0f3906afc4d6f3