Snap for 4957529 from 31e3517e588200f3165f7f26e4f764c172492e6f to pi-qpr1-release

Change-Id: I529c9c470b8b1688590933329d938856f3938cdf
tree: 92d3113e25a052ee7cb8bbfc253150c7c6bb597d
  1. service/
  2. PREUPLOAD.cfg