Merge "Refactor shouldTestThisNetworkType" into main