Merge \"Better distinguish between WifiScanner clients in logs\" into nyc-mr1-dev
am: b271c249de

Change-Id: I73368f5b04b082b039f3bea6bd51a43c4d497848
tree: 8dd526eeeb1258ca7cfe997049bb1a974d64b1d5
  1. service/
  2. tests/