Merge cherrypicks of [9513175, 9513021, 9513295] into qt-qpr1-release

Change-Id: Ia3cadfd316a4d18880e8b2399a5b30ff1327c3d4
tree: fadb392801a613508236c506e317837b19a5c707
  1. service/
  2. PREUPLOAD.cfg