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