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

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