Merge changes If94102c7,I8d51e8e0

* changes:
  Make ConnectivityServiceTest pass on wifi-only devices.
  Restore the net.dnsX system properties.