Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master
am: b005cebd8d

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