update apns from CM

Change-Id: Ia31035e2248e7b3f977a57d4344fc29a4a18778e