Merge "Use stable shims in service-connectivity" into tm-dev