Merge "Add codewiz@, reminv@ to OWNERS for connectivity" am: 76f081be5c
am: a96779b592

Change-Id: I781053bcceb117f3d83950a5ee477b766bb7e314