Merge "Adding OEM Network Preferences for testing"