Merge "Add eRate apn to sample apns - now with gid"