Merge "Create new APIs for overriding APNs"