DO NOT MERGE: Heap buffer overflow in xmlAddID am: 188e4b51 -s ours am: da148074 am: ce2a7a6f -s ours am: f33d4022 am: faea71fd am: 1b65eea9 am: e66bb5b0 -s ours am: 4d4b0298 Change-Id: Idb7a34ded87543ca9d38d53e1a47ad3ee4f9564a