Merge "Additional per-file OWNERS for shared directories."