Merge "Clean up some voicemail methods to be more clear." into lmp-mr1-dev