Merge "Update TetheringTests for new connectivity shims"