Merge "Fix EtherentTetheringTest flaky" into main