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

Change-Id: Ic59dd105d60c2dd44f60ed9f57b7e1381924080d
1 file changed