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

* commit '57185503a11d8509a432c673a1cb38d5efd6aacf':
  Fix ParserFactory not initialized error. [DO NOT MERGE]