Fix for parsing (escaped) ampersands in XML

Change-Id: I37bc098c322ee0b05a814bcbb54954066a8367b0