Merge "Refactor TAPI rpc DeleteConnectivityServiceImpl"