am 6dc8bab9: (-s ours) am c0fd1316: am e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]

* commit '6dc8bab993c55d239bc42822eb9a8003f7803dfd':
  Fix ParserFactory not initialized error. [DO NOT MERGE]