Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I2c9fd1e7b471bd2f75d326372aeae02f593ae769
Change-Id: If091f7ed754703942155666e51c7d0584663ad5f
tree: 01000fd4e365d54bd3e7a8adf02bef9c505c84c1
  1. service/
  2. PREUPLOAD.cfg