am cd61d139: Reconcile with ics-factoryrom-release

* commit 'cd61d139479709f0e2fa7a8c37109906d871d876':