Reconcile with ics-factoryrom-release

Change-Id: Id586eed2642eaf5d2e3c21d063c9d13acf83f551