Bug 985090 - Fix voicemail number migration issue and refactor
Merge pull request #17373 from crh0716/985090

Bug 985090 - Fix voicemail number migration issue and refactor r=jaoo