Reconcile with ics-factoryrom-2-release

Change-Id: I1f72cfb1dacf410727dc4b64765e67379a0aed58