[automerger skipped] Merge "Add a new directory to store downloaded apns" into pi-dev
am: 428a6ffaf8  -s ours

Change-Id: I7c401b92e02a4b41d89a0819ef67bfdd1b7b6777