Merge "Fix a bunch of multi-user API calls" into qt-qpr1-dev
am: 62e313a290

Change-Id: Ic0763adcd0744930be9134ed505394f2a89f8861
tree: d605efb6b583fa56e1fdb4d9a894d542a66e3d9a
  1. service/
  2. PREUPLOAD.cfg