"Update APNs from CM"

Change-Id: Ibdc9f1604211399bbfc13288bb710b499ea6fa49