Merge "P2P: Fix onServiceDiscovery callback param parsing" into oc-dev
tree: 20bc94b76a61b936fb29591383e598bd2f9313f0
  1. service/
  2. PREUPLOAD.cfg