Reconcile with ics-factoryrom-release

Change-Id: I4a1591c4e7c75bd09c41545138467fab6d24c78b