Merge "Only use framework-connectivity stubs for -t stubs"