Snap for 4807121 from c871b3111251ec477cf4231e63ebf8c64b6f71fd to pi-release

Change-Id: I71b3affe76a6e5ae04dc04229b4d59afffe160db
tree: bd92fa12d4deed610ee26d81ab9ee8af4700862a
  1. service/
  2. PREUPLOAD.cfg