am e9d99705: am 72dc0b43: Merge "Make Wifi Scans more heap-efficient" into klp-dev

* commit 'e9d997050bdd4cc273205f3451995f0e1e9cc3af':
  Make Wifi Scans more heap-efficient