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

Change-Id: Ic8a7dac8b38e97738e2d3f5584b48ece32d3ce97