am c0cf33c9: Reconcile with ics-factoryrom-2-release

* commit 'c0cf33c94e3f6c81d622be4062c9ba4c9c51cc4d':