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

* commit '4108f5653483076f53e28b26cd4b98e39661b0f7':
  Create a thread_local cache for textLocale