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

* commit '29f9fde8aaa4da3495a8bc2153dbb06dd32c2dd9':
  DO NOT MERGE ANYWHERE: Fix issue with WiFi scan reporting
tree: 250b2c6829b2b8f19eef3806f6da2273722b903d
  1. service/