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

Change-Id: I3e3e8947a89aeebb132767438ee66fa67e1c6dab