Merge changes I38c31645,Ib6f61b81 into oc-mr1-dev
am: c4f06ac4be

Change-Id: I79cdd12cae7ae31543f2c5b85598de0967ce4a47
tree: 35105f15bbd011706587d95578d5bbe705864c61
  1. service/
  2. PREUPLOAD.cfg