[automerger skipped] Merge "Change directory where apns-conf.xml is stored" into pi-dev
am: c7de985481  -s ours

Change-Id: I9ba0f0a1347be3bb9cddc771b37ac3cb5ec08082