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

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