Merge "Extend rpc visibility to more virt packages"