Merge "Add guard around getXmlFileParser() call" into mnc-ub-dev