Merge pull request #11288 from Andy2244/rpcsvc-proto_switch-to-git