Merge "Fix how WifiMonitor/WifiP2pMonitor sends a message" into oc-dev
tree: bdd5eb68d206a77b127e45037f27399d81349fbb
  1. service/
  2. PREUPLOAD.cfg