am f479d158: am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev

* commit 'f479d15814f58ed820829fef0bfadf73cb2b88aa':
  Fix stopBatchedScan not working for wifi