Merge "Better distinguish between WifiScanner clients in logs" into nyc-mr1-dev
tree: 4b480197e8424a2e7fdc2c1c8d75fde6d708e24f
  1. service/