Merge "Fix mvno match data is incorrect for APNs"