Merge pull request #1036 from zyearn/fix_grpc_ut

fix grpc ut