am ca403c3e: am 1db60a3b: am 47fc56dd: Fix broken CP2 unit tests and voicemail cleanup

* commit 'ca403c3eccd05a968fc7f54c12fdc08f78833794':
  Fix broken CP2 unit tests and voicemail cleanup