DO NOT MERGE: Heap buffer overflow in xmlAddID am: 969e8740 am: a618c631 am: 0ec47286 -s ours am: e1c18bac -s ours am: 3fd39b34 am: 24094c7d -s ours am: d559ec4b am: bf99fe8e am: af3dcc67 Change-Id: Ib4359a586574dc2355db591652a820b9b8089bd4