LanguageWithConversion fix

Should have been done when lazy Language initialization was added.

Change-Id: I7e90e752e1403da4bf154c05809d69fe1286a16d
Merge "LanguageWithConversion fix"