Reconcile with ics-factoryrom-release

Change-Id: Ic1b2b256832ba7fc797180de3c0b29380f6355d9