Reconcile with ics-factoryrom-release

Change-Id: I1de71b3c60aebb336e559fba952409c5da9e132f