Merge "Enable/disable FrameworksNetTests"