Merge "Update location OWNERS files"