Merge "EthernetTetheringTest: reduce test upstream prefix range"