Merge cherrypicks of [2782411, 2782222, 2782918, 2782412] into oc-dr1-release

Change-Id: I00c4e2e93490ccb577a2857519d9125c306d6ea4
diff --git a/spn-conf.xml b/spn-conf.xml
index ec9d868..2ec2e50 100644
--- a/spn-conf.xml
+++ b/spn-conf.xml
@@ -2,7 +2,6 @@
 <spnOverrides>
     <spnOverride numeric="23430" spn="EE"/>
     <spnOverride numeric="23433" spn="EE"/>
-    <spnOverride numeric="26202" spn="Vodafone"/>
     <spnOverride numeric="310004" spn="Verizon"/>
     <spnOverride numeric="302370" spn="Fido"/>
     <spnOverride numeric="310120" spn="Sprint"/>