Reconcile with ics-factoryrom-2-release

Change-Id: I82d01dc0c40aeeafc6b10fd1d4bf1464a2f02254