Reconcile with ics-factoryrom-2-release

Change-Id: Iea3f36179ad20263df6dbf71a5f4fefc7a931704