Merge changes from topic "am-35cf956b-e4b9-4d71-8e67-b3f3e90a9e22" into oc-dev am: d9feb6b31d
am: d6c5d56c95

Change-Id: Ib48b137e5881c75e16a314f04b5ba1a547d763f2
tree: 32fcb364c68dd0e3d3b6d84faa0d0237aa526ec7
  1. service/
  2. PREUPLOAD.cfg