Merge changes I76ae853c,If94102c7 into oc-dev

* changes:
  Ignore potential SystemProperties errors when setting net.dns
  Make ConnectivityServiceTest pass on wifi-only devices.