Merge "Update stale OWNERS." into main