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

Change-Id: I192cdc7f66a17587d2c86952b629b828aea41b05