Merge "Setup policy for downloaded apns directory" into pi-dev