am 759e0d6a: Merge "Fix LocalePicker locale filtering."

* commit '759e0d6a7a258dbc34a38a7db320827eb9144487':
  Fix LocalePicker locale filtering.