Merge stage-aosp-master to aosp-master - DO NOT MERGE am: f7c19a97c6 am: 70d9b10419

Change-Id: Iebc5bde63913303f4b9a19ee38091a9fa2df1574
tree: 2ba1a1c72093a3c5a6de4dc30cd483ae7ded8a50
  1. service/
  2. PREUPLOAD.cfg