am c5fe3c17: Merge "Initial implementation of WifiScanner"

* commit 'c5fe3c179c9f82cacaf0ac082f49de9f9c31708c':
  Initial implementation of WifiScanner