Merge change 372 into donut

* changes:
  WifiService: Cleanup parsing of wifi scan results.