Merge cherrypicks of [9256784, 9257496, 9256447] into qt-release

Change-Id: Ia436c880379a9b49361ac6622da60ab22e0c6c00
tree: 1dfcbaf04905bb4cd11e62d3fd7693f728da1622
  1. service/
  2. PREUPLOAD.cfg