DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master

Bug: 120502534
Change-Id: I0f63dde4fc9491528c4fe4e5477f604403403d8c
tree: 432d5b8032ba2bc0d9276720c0d5846c3b6ff6f0
  1. service/
  2. PREUPLOAD.cfg