DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I4d352f328c094b63e8751df2c53f5c3775d01f7d
tree: 5d8dc9bbab31b24bba4a7fb993d4d178ba455c82
  1. service/
  2. PREUPLOAD.cfg