Reconcile with ics-factoryrom-release

Change-Id: If2349f247f355d2405eab09e75f77b66c6c5b596