Reconcile with ics-factoryrom-2-release

Change-Id: Ic64060bceb7aef3ab5958a8b404e64526f794662