Merge "Prevent corruption of Wifi scan battery stats" into mnc-dr-dev
tree: e35dfd8538d039c8fac42f15cd1a3cb082288452
  1. service/