Cherry pick a missing CL
am: 23b5fe3a6b

Change-Id: Iffe270932bbba687003bfd7aca4c5cdedc7d479d
tree: 4c193ba1e6f30dc1972add37b8b5f504a1641040
  1. build/
  2. common/
  3. tools/
  4. OWNERS
  5. PREUPLOAD.cfg
  6. test_defs.sh