DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 8b032265ad

Change-Id: I0d7eef821fd1dbe4bd6ed77bedb834488e9ee0f7
tree: f480f446989c517188464859fd68c63f00ec093d
  1. service/
  2. PREUPLOAD.cfg