Merge pi-dr1-dev to aosp-master

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