Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: b6d5778700  -s ours

Change-Id: I21a744c8caff8a0a2491b0279b13e92cfab05216
tree: 324ffb725ee29414eff80b92e899f6f2d4de5d50
  1. adt/
  2. notices/
  3. repository/
  4. tools/
  5. OWNERS
  6. update_jars.sh