DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: a3ab3dd28b

Change-Id: I61f531cb425caf340820d971272b4de20a071419
tree: 01141124dd712c30ad82ece7882e8acb526eb419
  1. service/
  2. PREUPLOAD.cfg