am 94171212: am 104da1e4: Merge "Fix broken assumptions in LocalePicker."

* commit '94171212431a45346e40fd97bbe72422e71f04be':
  Fix broken assumptions in LocalePicker.