Merge "Fix hidden usage of networkCapabilitiesForType"