DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I20fe6bf9c050d7ca0cdd255bccaaa6c5e2a6ee34
tree: 81a5352896285c270a0d137ca2f7efc0b9a5e193
  1. service/
  2. PREUPLOAD.cfg