am 6312a721: am a6e57b88: Merge "Always use the LocalePicker\'s preferred locale names." into lmp-dev
* commit '6312a72136458287c467a224bb6e19ac9eedb203':
This commit is contained in: