Update APNs per CM

Change-Id: I397c6f8a017f10188ecd91b21a0bcc11f7dbfbe3