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

Change-Id: I47d2631183b0dccc11149e71fc4bd001a473f9c8
tree: 17c1ab0fe2d48b3b58f60a28a6a078183fd54727
  1. service/
  2. PREUPLOAD.cfg