Merge changes If830eb53,If03514f1

* changes:
  Update tethered/local only interfaces when no all networks request
  Use wifi p2p interfaces for mDNS