Merge "Fix RX/TX calculations for WiFi and BT"