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

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