Merge change 6661 into donut

* changes:
  wifi: WifiManager.startScan() will now do passive scans by default.