Reconcile with ics-factoryrom-release

Change-Id: I656e0ea68c6bf350f391a3922884216955997686