Merge "Add session ID to VpnTransportInfo" into sc-dev