Reconcile with ics-factoryrom-release

Change-Id: Ie9aa46783ea037a38b5ac5728b831e58c3c5e072