Merge "Reset single scan timestamp when disabling Wifi" into nyc-dev
tree: 7737aa6235d54b880cf7c4e91be9bb5832eed1e8
  1. service/