Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master
tree: cd1aebc704f0e0bf3a510c901cd3547768f1be1f
  1. service/
  2. PREUPLOAD.cfg