Merge changes I2cb3160c,Ie98f2afa,Iebf4b1c3 into oc-dev

* changes:
  [WifiScoreReport] cleanups
  WifiScoreReport housecleaning
  [WifiScoreReport] restructuring
tree: dd63729f66971f05610e7bd48945e0717bcd64fb
  1. service/
  2. PREUPLOAD.cfg