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