Merge "Fix issue where voicemail number is not saved properly" am: 77abb19537
am: 02458798c9

Change-Id: Ic4f52e7fb738da38a413ecf0cff37c9b6404ff09