Merge pull request #8367 from davidflanagan/bug845539

Bug 845539: display correct error message for invalid phone numbers r=gtorodelvalle a=tef+(cherry picked from commit 50e404a41581ac2958b2a377a6e12ec5441b7580)
Merge pull request #8750 from davidflanagan/bug845539-v1.0.1

Bug 845539: display correct error message for invalid phone numbers r=gtorodelvalle a=tef+(cherry picked from commit 50e404a)