Reconcile with ics-factoryrom-release

Change-Id: I849876516cfa315f96ac984b52fc6dc21e053577