DO NOT MERGE: Heap buffer overflow in xmlAddID am: 969e874097 am: a618c631d0 am: 0ec4728680  -s ours am: e1c18bac61  -s ours am: 3fd39b343a am: 24094c7d88  -s ours
am: d559ec4b68

Change-Id: I7d0dc856a55e56d60f57336c7a6665bd71bca4c7