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