[automerger skipped] Merge changes Ice7f8995,I7a788777 into qt-qpr1-dev am: ee958526ff
am: 92f0fab452 -s ours
am skip reason: change_id Ice7f89952c0a71c181ea5de58e417c02e7f2bf91 with SHA1 0d07c698f2 is in history

Change-Id: I2a2f624c4486c0209e6da4f716e4b0185f5aeba0
tree: 1beba2239128979b36ad79004497f205a6cc2b38
  1. service/
  2. PREUPLOAD.cfg