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

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