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

* commit '72dc0b439152ad1428d8713abc2b8f16911e2e7e':
  Make Wifi Scans more heap-efficient