Merge changes Ice7f8995,I7a788777 into qt-qpr1-dev
am: ee958526ff

Change-Id: I2441c1adfc3d6320851565dae35e3ca9da59bea1
tree: d56e3f984d2eb64d69e27846a5360660e1c3d591
  1. service/
  2. PREUPLOAD.cfg