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