Merge "Change disambiguation wording for sms/phone numbers." into jb-dev