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

* changes:
  [automerge] Tradefed () 2p: c1bf1ccad4
  Tradefed ()
tree: 36540c488ea999fce9f47a345bb8309e0aae4d06
  1. filegroups/
  2. test_harness/
  3. OWNERS