Reconcile with ics-factoryrom-release

Change-Id: I06501b22944cf98bc3a6d37bcb0a40a21fbc5b8c