Merge "Use apn types instead of host when sending notifications."