Fix method parameters > 2 omitted when using mapping file

Change-Id: I603ad1d6af2298cfa850f6e2c13d1fded9f568b7