I18n fixes.

Addresses bug 42885 and bug 42884

Change-Id: I9d7b700c53c82e22b19333ef7a4df9e842751a2c
Merge "I18n fixes."