Merge "EthernetTetheringTest: test testTetherClatTcp on S+ device"