Merge changes Ia9932379,Ic5e2fa1c into qt-dev
am: 28f84accf6

Change-Id: I081ca8f87fb617dc04712263142d6bdba2072040
tree: 971fd40bc0b793be0bfd44909ed4e843c6ce293e
  1. service/
  2. PREUPLOAD.cfg