Merge "Changing RuntimeException on old-apns-conf file not found to error msg." am: 3ad0b41cfc am: 4c08dfe31b
am: a157402cc4

* commit 'a157402cc45afa94266e731270e9ab477d0634d9':
  Changing RuntimeException on old-apns-conf file not found to error msg.