Merge "Add a test to catch wifi tethering no upstream bug" into main