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