Update APNs from CM

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