am fdfe6ffb: am afc107c7: (-s ours) am 1fba5d21: Merge "Fix crash when deleting voicemail." into mnc-dev

* commit 'fdfe6ffba141acfb5f970977f61a9d8f619a2514':