Reconcile with ics-factoryrom-release

Change-Id: I35a78040547d4f13dcf96639a229b0b64a18bbf8