am 711b1376: (-s ours) am 5300c426: am 3abd1490: am cf210fd6: (-s ours) am 56e34715: Fix threading problems in voicemail code - DO NOT MERGE

* commit '711b137639f25a3f878ad8ff3865894d387b3f47':
  Fix threading problems in voicemail code - DO NOT MERGE