Merge "Remove reference to WifiScanner till the API is made public"