[automerger skipped] Merge "Fix a bunch of multi-user API calls" into qt-qpr1-dev am: 62e313a290
am: b84e6bd849 -s ours
am skip reason: change_id I400bad75510b064ad405fae07f56671d2c211178 with SHA1 651c36abff is in history

Change-Id: Ibdbdda400f9a10c6adc555e856a27a5d824ff76d
tree: 061ba4bd14fb622f00fcc2b7e163e76e94878c70
  1. service/
  2. PREUPLOAD.cfg