Merge 86cad574d47129e9ba8f03651d8e4ec79e81e0c8 on remote branch

Change-Id: I4f38a4a67ae87f53f032f82cc8c27eb54e4f3c2c
tree: 57c8deed1e399676a9710bb6efad360328a655cf
  1. filegroups/
  2. test_harness/
  3. OWNERS