am 25cbe892: Reconcile with ics-factoryrom-2-release
* commit '25cbe8924a7ec5c45914c8818b5ad7b39e1f6103': Fix a bug that would end up in memory corruptionmain
commit
cdd9c16e47
* commit '25cbe8924a7ec5c45914c8818b5ad7b39e1f6103': Fix a bug that would end up in memory corruptionmain