Merge "VPN: Hook up the new control protocol and network state."