Merge "Fix TetheringIntegrationTests failure"