Snap for 4939496 from 1bfa9d7791a6afb22a9970f10493a3debe029733 to pi-qpr1-release

Change-Id: Ib7b899c4205a5c3e77d4c9ee36ed670a7876f8d6
tree: 6ee3ba1aac8f4cae031a4fc0c60f0aa4455fcc43
  1. service/
  2. PREUPLOAD.cfg