Snap for 4787078 from 26ef01ed1aca597926cff43975e43fe33f18b5b5 to pi-release

Change-Id: I6f5710ac3c38fe3d3409871b3237d905671e077a
tree: 2a1436a29c377f3b081e1dd27625b4189e29809c
  1. service/
  2. PREUPLOAD.cfg