Do not clean connectors before client rpc is sent (#11192, #7891)

Change-Id: I9b0f6f3fb48cad8f870bfa9ccfe99a5725f24b8e