Merge "p2p: only gate sensitive API by location settings" into qt-dev
am: d4c29971f4

Change-Id: Ia5103582aa9f9dad21cc80a41da0b99670fd9d33
tree: 61d8d6807fc7a18da8d38954ccedacb776257e49
  1. service/
  2. PREUPLOAD.cfg