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

This reverts commit 0ec2da54f8e5fd0faa85aebe1a9ea502a775b703.

Change-Id: Id685c338ab5474e41cfd3792ef98b9cf4b0c4fba
20 files changed