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

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