Snap for 4826885 from 440169013a5e493c2f525d43494559188d7ad580 to pi-release

Change-Id: I9dc992326f191c1e66e3913319fdba05f436bb90
tree: cc6816cd66d359737084970515ed305e922eeaf7
  1. service/
  2. PREUPLOAD.cfg