Merge "Write clearer code to set voicemail number." into lmp-mr1-dev