Fix XML Parsing errors

Change-Id: I53a140017a9567ce54081ecb9fe00a7940510c53