[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
am: a4d347e4ac  -s ours

Change-Id: Ida1c26cf196198aa11a9c10aa39641ab81253aa2
tree: 432d5b8032ba2bc0d9276720c0d5846c3b6ff6f0
  1. service/
  2. PREUPLOAD.cfg