Do not show 'null' as translation for untranslated messages

Change-Id: I2061d308d6fc0c66367ad2a9aed4b67217e7771e