Reconcile with ics-factoryrom-release

Change-Id: Ic9b67f23461c79494602a31e6a671300b7943ee9