Reconcile with ics-factoryrom-release

Change-Id: I90b269fd21b390eae70d5b037bc0d2e243f8bea1