Merge "Update TetheringTests for new connectivity shims" into sc-dev