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

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