am be240e13: Merge "Remove the isLocaleAvailable hacks."

* commit 'be240e1324314cbf1d8edaee7ce561b028e1ed2e':
  Remove the isLocaleAvailable hacks.