Update APNs from CM

Change-Id: Iadeb55e1d87977ee1a3c7c1fff927c40da155397
Merge "Update APNs from CM" into kk44