Merge "Sonar Fix: XmlParser.java"