Merge stage-dr1-aosp-master into stage-aosp-master

Bug: 112535855
Change-Id: I4698e09be49297d47f5c02ab103a0f88d143684b
tree: aec84de92900e7ce7dab78528f53d76995c818bc
  1. service/
  2. PREUPLOAD.cfg