Merge "Ensure null/empty phone number does not crash international number check." into oc-dev am: 0f542b48fb
am: 58e8a224e3

Change-Id: I14a17436328f6324842cbc7c257baf9e4cf60c7f