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

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