Merge branch 'upstream/main' into master

Change-Id: If5148015888834c63676aacb77c72c3fad0d83dc
tree: 2beacee19d87d2321b3200ffd960a7c7bbab4003
  1. stats/
  2. DIR_METADATA
  3. OWNERS