Merge changes from topic "topic_sc-dev" into sc-mainline-prod

* changes:
  [automerge] Tradefed () 2p: d3eed48e97
  Tradefed ()
tree: 7a71dde8c598c57bd812c488e53b0a6d535dba61
  1. filegroups/
  2. test_harness/
  3. OWNERS