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

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