am 6a6979ad: am 86315c45: Merge "Fixes issue causing pseudolocalization of...
am 6a6979ad: am 86315c45: Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
* commit '6a6979ad':
Fixes issue causing pseudolocalization of strings in non-translatable resource files.