Merge "Fix FrameworksNetIntegrationTests failure"