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

* commit 'c60232434c941b5175a9ebb542b1c872866d3409':