Merge "Corrected SPN and PLMN name handling"