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

* commit '48aea8cc12ea7606b36bc474f91891f463554ef8':
  Fix build: udpate parser factory method [DO NOT MERGE]