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 Change-Id: I3c6ba7fd81da904d9c7712e2fc795fad7e100a71