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

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