Merge changes I0f997d30,I288ba1f4

* changes:
  Enable new DHCP server by default
  Use new DHCP server in TetheringTest