Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."