DO NOT MERGE: Heap buffer overflow in xmlAddID am: 969e874097 am: a618c631d0 am: 0ec4728680  -s ours am: e1c18bac61  -s ours am: 3fd39b343a
am: 24094c7d88  -s ours

Change-Id: Iddd759d644d0d12f09c9fc79ad56e099664071ec