Merge "Add support to invoke device specific RPC"