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

* commit '5ae312fb5b601d2c60e197f94c6a292700776140':
  Fix LocalePicker locale filtering.