Merge "Bug 1328: Improved argument checks in generated RPC Router"