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

Change-Id: Idc952903e8cc0c17c2ed91f552024dde941c1164
tree: 154ed0fbb02c23d63e5529da81be9e83c2d35ae3
  1. service/
  2. PREUPLOAD.cfg