Merge "Address review comments in aosp/2677976" into main
tree: 824f5ac7a7c0c74025dc352eee8dd4357b093f31
  1. client-libs/
  2. common/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING