Merge "Remove broken records in OWNERS" into main