Merge "Fix TetheringTest when run on B" into main