Fix some i18n message handling

Change-Id: I363d311e137cab5dfcf878d8816f821dfc1f41da
Merge "Fix some i18n message handling"