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

* commit '16666176c0de5abc1f5390b9b2e07c32e51a97f9':
  Fix Wifi Batch Scanning