DO NOT MERGE: Heap buffer overflow in xmlAddID am: 969e8740 am: a618c631 am: 0ec47286 -s ours am: e1c18bac -s ours am: 3fd39b34 Change-Id: I192cdc7f66a17587d2c86952b629b828aea41b05