Merge "Refactor TAPI rpc CreateConnectivityServiceImpl"