Merge "Add codewiz@, reminv@ to OWNERS for connectivity"