Merge pi-platform-release to stage-aosp-master - DO NOT MERGE

Change-Id: I98b06efb684ebfb5225411b562b8ab1b5c8e7ea2
tree: 6273ac339464c52fb67cb952e4aa0fd0f96afd4e
  1. service/
  2. PREUPLOAD.cfg