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

Change-Id: I684a50f261922138062fc080db66354f17c440fc