am 3b6689c0: (-s ours) am e781efd6: am f479d158: am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev

* commit '3b6689c010edd2deaf112f4d4239deeb2a244ea5':
  Fix stopBatchedScan not working for wifi