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

Change-Id: I6328f9235f95c8d39b1fb109bba688332c93ac8f