DO NOT MERGE - Merge QQ1A.200205.002 into master

Bug: 147428392
Change-Id: I9d18751081ef2911b31a245d2c6b4e188ab51d04
Merged-In: I31a9a7507208930a19d935b7aa8bbd8efd5d338a
tree: 5c5ec5d864418fb65193aef88f2351bd791d6ae1
  1. service/
  2. PREUPLOAD.cfg