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

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