Merge changes If25054c3,I2f58d769

* changes:
  ethernet: use consistent timeout values
  ethernet: use short timeout for assumeNoInterfaceForTetheringAvailable