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

* commit '4161316f256c9cc047405a902bcfc17b3738b659':
  Fix broken assumptions in LocalePicker.