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

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