am 605e0d84: am 932a9fc5: am 48aea8cc: am df44516b: am 59f026e9: (-s ours) am 81990c3f: am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]

* commit '605e0d846f55ee3066f602fa2922b6a46f00fe5c':
  Fix build: udpate parser factory method [DO NOT MERGE]