Merge "added new APNs to apns-full-conf.xml" am: 1f9a49b871
am: eaf6e1eda7

Change-Id: I83750be305103a88e4b7419a26378da61f3c5fed