Reconcile with ics-factoryrom-2-release

Change-Id: Ib5a550f4261b0810187d95e9a7844144641b322b