Merge "Added extra logic for selecting APNs for a subscription"