am 91b89c6a: am 318297f2: Merge "Fix AutoText setting of locale"

* commit '91b89c6a0e5615c675bcecacbfc474d02f3b7aca':
  Fix AutoText setting of locale