Reconcile with ics-factoryrom-2-release

Change-Id: Ieddd7ec26db003b46bfc01db728a5795cbff61ab