Fix multi-locale issues
am: 2ee1d54fa1

Change-Id: I5878497a3677f3361c9b0916e7e03dd1cfa9cd3b