DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: 44d218718d

Change-Id: I31c435285ebd105e11c348eb06dc8498ffc41777
tree: b9045c229c19329bfe6e8c081604ed8c97c83368
  1. service/
  2. PREUPLOAD.cfg