Merge "Use stable shims in service-connectivity"