Merge "DO NOT MERGE ANYWHERE: Fix issue with WiFi scan reporting" into mnc-dr-dev am: 29f9fde8aa  -s ours
am: ba1da4facb  -s ours

* commit 'ba1da4facb5c7086475f310af04d70c09dd22d0d':
  DO NOT MERGE ANYWHERE: Fix issue with WiFi scan reporting
tree: 4bbc15e716979131a10c5b1adfc51d6acfef6297
  1. service/