Merge "Allow TRANSPORT_TEST ethernet networks" am: 6642ec61c3

Change-Id: Ib9ab1ddb855c90219e94c4b74dc7268cfbcdb661