Merge "Don't set voicemail handle to null" into lmp-mr1-dev