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

* commit '4117b4e3bd50e76135375da84b8754a0fade7c3e':
  Fix default locale issue (cherry picked from commit 2a52f5c52693dd15c3ac154670081f70dfae4ba9)