am 729a901: Merge change 1099 into donut

Merge commit '729a901b2a9ca163d6395983711cea1fdc7b5eb5'

* commit '729a901b2a9ca163d6395983711cea1fdc7b5eb5':
  Fix Phone-based locale selection to never choose a lang-only locale.