am 38299d85: am 4117b4e3: am cda56ef6: Fix default locale issue (cherry picked from commit 2a52f5c52693dd15c3ac154670081f70dfae4ba9)

* commit '38299d856987b7f74e43e49327260446520cf9e3':
  Fix default locale issue (cherry picked from commit 2a52f5c52693dd15c3ac154670081f70dfae4ba9)