Reconcile with ics-factoryrom-release

Change-Id: I51b4b8d176ec0513747cded7d63a45ab0c527abd