Snap for 4818534 from b8f9dbb9befae20a67b8c335de13f0862b192d38 to pi-release

Change-Id: I46839e0f1bcdc7415b32e458d15af5dd0dad2980
tree: 4e4acf6664c12f784471e0044588c808082d68b0
  1. service/
  2. PREUPLOAD.cfg