am 2ccd0ac6: Merge "Write clearer code to set voicemail number." into lmp-mr1-dev

* commit '2ccd0ac6a7c22e413733bf24c7c04e835445ab65':
  Write clearer code to set voicemail number.