Merge "Workaround prebuilt name conflict for service-connectivity" into tm-dev