Merge "Remove RPC interface Type"