backport patches to fix issues such as grpc hangs. Signed-off-by: chenjingwen <lhchenjw@gmail.com> (cherry picked from commit 22d40eb3b318226838306f6ce4b7c81095cfbe05)
