Merge "Add a new directory to store downloaded apns"
am: e0a52774b4

Change-Id: I6c4c9df2b380e633aa11b7fa42ccdf19a6d39e52