DO NOT MERGE - Merge QP1A.191005.007 into master

Bug: 142297020
Merged-In: I095f9755c60034064e467dedcdb16b33dc63d9eb
Change-Id: I0f00671e66654aa4141acb7c80bd7bbe349886dc
tree: 1dfcbaf04905bb4cd11e62d3fd7693f728da1622
  1. service/
  2. PREUPLOAD.cfg