Merge "Removing privileged context requirement for civic location (server)" into qt-r1-dev am: addb80c351 am: 54ee33a71c
am: 8dfdb52c58

Change-Id: I9ca506094461ae981a709ef4d2237f62c9e77e1e
tree: 5d4d287d22e9dade9730387194bd419f5a57f75f
  1. service/
  2. PREUPLOAD.cfg