Revert "Fixing string not correctly marked as non-translatable"

This reverts commit 477b8cc1b457b66a432f3a2fe062b76127860108.

Change-Id: I114f89c20d735d0e17cc93e8f78876bf8a388a6a
22 files changed