Merge "Use PLMN instead of SPN override for Rogers, DTAG and Telstra" into oc-dr1-dev