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

Change-Id: I6b534dbb9253ad66c850c8d55a8e4b0b619ac64e