Merge "Fix TetheringIntegrationTests failure" into rvc-dev