Merge "Add guard around getXmlFileParser() call" into mnc-ub-dev
am: 8662173  -s ours

* commit '86621737fc1ba2d6ce7cb97e61fc8ce186eb851a':
  Add guard around getXmlFileParser() call