DO NOT MERGE: Heap buffer overflow in xmlAddID am: 188e4b51 -s ours am: da148074 am: ce2a7a6f -s ours am: f33d4022 am: faea71fd Change-Id: I4191066c8a3d25031cf3f28e434703d3a376544c