Snap for 4793185 from 0c24fe2306ab5665578de8ac246fec0db69a0f18 to pi-release

Change-Id: I964a625e59517ba7dc9e67e5bd0211f4ec96a5b0
tree: 03892863e4c5e00dc8ebf6ca1859f554c4348bb0
  1. service/
  2. PREUPLOAD.cfg