Merge "Add session ID to VpnTransportInfo"