Address review comments on ag/7904889.
am: 2a50b72a4a

Change-Id: I35a15d158f659e95587497a9df8c889cc27f6f70
tree: 9f02bdd73cbea75dfb1adc33948eaf88e32a6578
  1. service/
  2. PREUPLOAD.cfg