Merge "Bonjour fixes"
tree: 96052a0f4f253646844cfb7487d781b09a4057f6
  1. core/
  2. services/
  3. wifi/