Merge "Fix for location of OWNERS file for tests directory."