Merge "Add tx_bytes and rx_bytes to UpstreamEvent message"