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

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