Merge "Update APNs for emerging markets." into klp-dev