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

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