am ee3c1ea5: am 4108f565: am b25c0bb7: am 525ac80d: Merge "Create a thread_local cache for textLocale" into mnc-dev

* commit 'ee3c1ea59dfe357b9ac59b4aae056280ccc6417b':
  Create a thread_local cache for textLocale