DO NOT MERGE: Heap buffer overflow in xmlAddID am: 969e8740 am: a618c631 am: 0ec47286 -s ours am: e1c18bac -s ours am: 3fd39b34 am: 24094c7d -s ours am: d559ec4b Change-Id: I7d0dc856a55e56d60f57336c7a6665bd71bca4c7