Reconcile with ics-factoryrom-2-release

Change-Id: I98da1431300159df84adf6d9f3b362b9d803d900