am 6a1d4b99: am 8e767115: Merge "Don\'t update the text services locale in the...
am 6a1d4b99: am 8e767115: Merge "Don\'t update the text services locale in the main thread" into jb-mr1-dev
* commit '6a1d4b99':
Don't update the text services locale in the main thread