Merge "Secure access to WifiScanner" into lmp-dev