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