Merge "Use new VpnTransportInfo constructor"