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

* changes:
  [automerge] Tradefed () 2p: 514ea23f69
  Tradefed ()
tree: df9760725a6d6dd7cbb55dd02535e46fe5b2b04d
  1. filegroups/
  2. test_harness/
  3. OWNERS