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

* commit '6a6979ad17dfb492fb85a979e8f8688e4ed973b2':
  Fixes issue causing pseudolocalization of strings in non-translatable resource files.