Merge changes I478f1d55,I39bb0916 into qt-qpr1-dev
am: a87047bfc5

Change-Id: I177df34731022788f28a087bbb74f17a4f2751c7
tree: d848c727194f3d05952e0d1f1afa2a54a1b048b1
  1. service/
  2. PREUPLOAD.cfg