Merge "Fix bug in isVoicemailNumber method not returning early" am: 59c58249e8
am: 9f604235bc

Change-Id: Ia9377f6b9dc1d5bd6d1d8046f3ab0ef518081489