Reconcile with ics-factoryrom-release

Change-Id: I223d353a699f6f258e2a2e47f81d528879c4381b