am bda0d8e3: Merge "Mark configuration strings as non-translatable."

* commit 'bda0d8e3d6d4ddb5d70351169852693b4c5ec047':
  Mark configuration strings as non-translatable.