Snap for 4916303 from ae7d78a0989c7f0d881f50d78195d5a7f47f5ea6 to pi-qpr1-release

Change-Id: Id2830f4af883838fa16b2b525a20faa670602f1d
tree: ec1ce9a3a5fec07a136ff0bd6c56d0ce3280a470
  1. service/
  2. PREUPLOAD.cfg