Merge "Update WifiScanningService class name to new location" into nyc-dev