Merge pi-dr1-dev to aosp-master
am: 3497bad6a5

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