Merge "Fix testPhysicalEthernet failure for physical ethernet device"