am 3dafbf68: Merge "Change disambiguation wording for sms/phone numbers." into jb-dev

* commit '3dafbf6802d83420687cc02ee79cbaff5aa58763':
  Change disambiguation wording for sms/phone numbers.