am dfe0c293: Merge "Add entries for string resources that appear in clings" into jb-mr1-dev

* commit 'dfe0c29383049b269094a51fd74e693a8cb9b5b0':
  Add entries for string resources that appear in clings