Fix multi-locale issues am: 2ee1d54fa1
am: f9aa1ae196

Change-Id: Icb656785168b52935e66bec49eed1956b1984f41