Merge stage-aosp-master to aosp-master - DO NOT MERGE

Change-Id: I05777ca70e446cdfa7a3a5299c544de72a26e90d
tree: d4f3831a0ebda03f78a34d7ed55db9bdc05f236c
  1. service/
  2. PREUPLOAD.cfg