Merge "Address review comments on ag/7904889. am: 2a50b72a4a am: d78b377631" into qt-r1-dev-plus-aosp
am: eda7ae2508

Change-Id: Ib62f0e4a8535881b6bfbdd41e26c412351ffdcbc
tree: 00dfeb050bc7c5aaeb0db3ce1897cfe34c7e1c0b
  1. service/
  2. PREUPLOAD.cfg