Reconcile with ics-factoryrom-release

Change-Id: I95804a1a46496e2ba9336831eaeac9ae58d12d17