Reconcile with ics-factoryrom-2-release

Change-Id: Ie0c40f94cf560dbe14a334d2e177e4e4a9d32eb7