am f784436c: am 5b588540: Remove deprecated locales - DO NOT MERGE

* commit 'f784436c69fb29fb243b8d11f9db4184cccf0026':
  Remove deprecated locales - DO NOT MERGE