am d9d6ef8b: (-s ours) am baed1b54: am d9c5ba0e: Remove deprecated locales - DO NOT MERGE

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