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

* commit '104da1e495cbed81e7ebe66b80344bf916b02391':
  Fix broken assumptions in LocalePicker.