Merge "Used APN type instead of APN id"