am 330ba9dd: (-s ours) am d6972516: am fa27cc26: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev

* commit '330ba9dd255397dfc7f1d21b00fe12d2f7a0ff21':
  Remove deprecated locales - DO NOT MERGE