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

* commit 'd9adc588c901af749cb5d0876a46b67fcd024bf4':