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

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