Merge "Fix build: udpate parser factory method" into mnc-dev