Reconcile with ics-factoryrom-2-release

Change-Id: I060bd9a6e64c279a97b86ba72ef3589cd5d3cf91