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

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