Reconcile with ics-factoryrom-release

Change-Id: Ic9d7efb8cb6228820010bb55973cef63b93b8e65