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

* commit 'afc107c78cdb7204501bf6fef77737291aef111a':