Merge "Fix NPE in WifiScanningService" into nyc-mr1-dev
tree: dd94e18f4d59c5a2e833e83c043d6241cf714958
  1. service/
  2. tests/