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

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