am 8f435bac: Merge "Fix Wifi Batch Scanning" into klp-dev

* commit '8f435baca8b5285a6b4658fc9563f5fcbbdafc6e':
  Fix Wifi Batch Scanning